fix transaction IDs in legacy UI trade info views #482
Conversation
| @@ -116,6 +116,8 @@ shared.OR=OR | |||
| shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. | |||
| shared.waitingForFunds=Waiting for funds... | |||
| shared.depositTransactionId=Deposit transaction ID | |||
There was a problem hiding this comment.
I was expecting shared.yourDepositTransactionId, shared.peerDepositTransactionId, shared.makerDepositTransactionId and shared.takerDepositTransactionId with shared.depositTransactionId unused and removed based on our conversation
There was a problem hiding this comment.
Removed depositTransactionId completely and added taker/maker.
| @@ -265,9 +265,6 @@ private void addContent() { | |||
| addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId()); | |||
| addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerFeeTxId"), "TAKER FEE TX ID NOT PART OF CONTRACT"); // TODO (woodser): should taker fee tx id be part of contract? | |||
|
|
|||
| if (dispute.getDepositTxSerialized() != null) | |||
There was a problem hiding this comment.
This removes the deposit tx hash from the contract window. Per our conversation, this view was to show the maker and taker deposit tx hashes using e.g. contract.getMakerDepositTxHash().
There was a problem hiding this comment.
Ah I misunderstood. Thought there's going to be a follow up PR. Please check again.
napoly
force-pushed
the
fix-transaction-IDs-legacy-UI-trade-info
branch
from
6fc2161 to
a4e13f8
Compare
| if (trade.getMakerDepositTx() != null) | ||
| addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.depositTransactionId"), // TODO (woodser): separate UI labels for deposit tx ids | ||
| addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.yourDepositTransactionId"), |
There was a problem hiding this comment.
Should be shared.makerDepositTransactionId and shared.takerDepositTransactionId here.
napoly
force-pushed
the
fix-transaction-IDs-legacy-UI-trade-info
branch
from
a4e13f8 to
bab8ca6
Compare
napoly
force-pushed
the
fix-transaction-IDs-legacy-UI-trade-info
branch
from
bab8ca6 to
0b98cad
Compare
|
Thanks :) |
Should fix #478